Merge "resourceloader: Remove deprecated MessageBlobStore::insertMessageBlob"

diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index bbaaf16..60a49b7 100644 (file)
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -39,7 +39,7 @@ changes to languages because of Phabricator reports.
 * …
 
 === Other changes in 1.31 ===
-* …
+* MessageBlobStore::insertMessageBlob() (deprecated in 1.27) was removed.
 
 == Compatibility ==
 MediaWiki 1.31 requires PHP 5.5.9 or later. There is experimental support for

diff --git a/includes/cache/MessageBlobStore.php b/includes/cache/MessageBlobStore.php
index b076a08..b262eab 100644 (file)
--- a/includes/cache/MessageBlobStore.php
+++ b/includes/cache/MessageBlobStore.php
@@ -128,14 +128,6 @@ class MessageBlobStore implements LoggerAwareInterface {
                return $this->getBlobs( $modules, $lang );
        }
 
-       /**
-        * @deprecated since 1.27 Obsolete. Used to populate a cache table in the database.
-        * @return bool
-        */
-       public function insertMessageBlob( $name, ResourceLoaderModule $module, $lang ) {
-               return false;
-       }
-
        /**
         * @since 1.27
         * @param ResourceLoaderModule $module

diff --git a/tests/phpunit/includes/OutputPageTest.php b/tests/phpunit/includes/OutputPageTest.php
index 52103f9..d29c79d 100644 (file)
--- a/tests/phpunit/includes/OutputPageTest.php
+++ b/tests/phpunit/includes/OutputPageTest.php
@@ -685,10 +685,6 @@ class NullMessageBlobStore extends MessageBlobStore {
                return [];
        }
 
-       public function insertMessageBlob( $name, ResourceLoaderModule $module, $lang ) {
-               return false;
-       }
-
        public function updateModule( $name, ResourceLoaderModule $module, $lang ) {
        }